From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 18 Jan 2010 22:02:28 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8462^2~45
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6b9d456cd31cc76cdcb11c438def2ec3343901ea;p=emacs.git

Merge from mainline.
---

6b9d456cd31cc76cdcb11c438def2ec3343901ea